Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Wed, 10 Aug 2005 18:44:42 +0000 (10:44 -0800)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Wed, 10 Aug 2005 18:44:42 +0000 (10:44 -0800)

Trivial merge